@@ -20,6 +20,8 @@ from utils.url_utils import img_url  | 
            ||
| 20 | 20 | 
                from utils.error.errno_utils import UserStatusCode, GroupStatusCode, GroupPhotoStatusCode  | 
            
| 21 | 21 | 
                from utils.error.response_utils import response  | 
            
| 22 | 22 | 
                 | 
            
| 23 | 
                +from utils.sql.raw import PAI2_HOME_API  | 
            |
| 24 | 
                +  | 
            |
| 23 | 25 | 
                from curtail_uuid import CurtailUUID  | 
            
| 24 | 26 | 
                 | 
            
| 25 | 27 | 
                from TimeConvert import TimeConvert as tc  | 
            
                @@ -656,7 +658,7 @@ def pai2_home_api(request):  | 
            ||
| 656 | 658 | 
                     num = int(request.POST.get('num', settings.PAI2_HOME_PER_PAGE))
               | 
            
| 657 | 659 | 
                 | 
            
| 658 | 660 | 
                cursor = connection.cursor()  | 
            
| 659 | 
                -    cursor.execute(r"select T1.group_id, T2.group_name, T2.group_default_avatar, T2.group_avatar, T3.id, T3.photo_path, T3.photo_w, T3.photo_h, T3.photo_thumbnail_path, T3.photo_thumbnail_w, T3.photo_thumbnail_h, T3.user_id, T3.nickname, T3.avatar, T3.comment_num, T3.thumbup_num, T3.created_at from (select * from group_groupuserinfo where user_id='{user_id}') as T1 left outer join group_groupinfo as T2 on T1.group_id = T2.group_id left outer join group_groupphotoinfo as T3 on T1.group_id = T3.group_id and T3.status=1 and T3.id > T1.current_id order by DATE(T3.created_at) desc, T3.thumbup_num desc limit {offset}, {rows};".format(
               | 
            |
| 661 | 
                + cursor.execute(PAI2_HOME_API.format(  | 
            |
| 660 | 662 | 
                user_id=user_id,  | 
            
| 661 | 663 | 
                offset=0,  | 
            
| 662 | 664 | 
                rows=settings.PAI2_HOME_MAX_ROWS,  | 
            
                @@ -0,0 +1,10 @@  | 
            ||
| 1 | 
                +# -*- coding: utf-8 -*-  | 
            |
| 2 | 
                +  | 
            |
| 3 | 
                +PAI2_HOME_API = r"select " \  | 
            |
| 4 | 
                + r"T1.group_id, T2.group_name, T2.group_default_avatar, T2.group_avatar, T3.id, T3.photo_path, T3.photo_w, T3.photo_h, T3.photo_thumbnail_path, T3.photo_thumbnail_w, T3.photo_thumbnail_h, T3.user_id, T3.nickname, T3.avatar, T3.comment_num, T3.thumbup_num, T3.created_at " \  | 
            |
| 5 | 
                +                r"from (select * from group_groupuserinfo where user_id='{user_id}') as T1 " \
               | 
            |
| 6 | 
                + r"left outer join group_groupinfo as T2 on T1.group_id = T2.group_id " \  | 
            |
| 7 | 
                + r"left outer join group_groupphotoinfo as T3 on T1.group_id = T3.group_id and T3.id > T1.current_id " \  | 
            |
| 8 | 
                + r"where T3.status = 1 " \  | 
            |
| 9 | 
                + r"order by DATE(T3.created_at) desc, T3.thumbup_num desc " \  | 
            |
| 10 | 
                +                r"limit {offset}, {rows};"
               |